From: iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Date: Sat, 15 May 2004 09:55:40 +0000 (+0000)
Subject: bitkeeper revision 1.906 (40a5e91cnvIS_3gLwfnD2G3HV3odHA)
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~18215
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=5080a3f4b2b79dfba61e45ebbefc83531338e20e;p=xen.git

bitkeeper revision 1.906 (40a5e91cnvIS_3gLwfnD2G3HV3odHA)

manual merge
---

5080a3f4b2b79dfba61e45ebbefc83531338e20e
diff --cc xen/common/dom0_ops.c
index f768edd5ff,5956581018..32fa532c9a
--- a/xen/common/dom0_ops.c
+++ b/xen/common/dom0_ops.c
@@@ -21,22 -21,8 +21,13 @@@
  #include <xen/shadow.h>
  #include <hypervisor-ifs/sched_ctl.h>
  
 +
 +#define TRC_DOM0OP_START_BASE   0x00020000
 +#define TRC_DOM0OP_FINISH_BASE  0x00030000
 +
 +
  extern unsigned int alloc_new_dom_mem(struct task_struct *, unsigned int);
  
- /* Basically used to protect the domain-id space. */
- static spinlock_t create_dom_lock = SPIN_LOCK_UNLOCKED;
- 
- static domid_t get_domnr(void)
- {
-     static domid_t domnr = 0;
-     return ++domnr;
- }
- 
  static int msr_cpu_mask;
  static unsigned long msr_addr;
  static unsigned long msr_lo;